Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 31 Oct 2017 15:22:31 +0000 (15:22 +0000)
committerbors <bors@rust-lang.org>
Tue, 31 Oct 2017 15:22:31 +0000 (15:22 +0000)
commit3bab08445141279cc63f68f50be27623637e4c93
tree3b0babbfc1155ed4fc4f8957fecd7ec29712146d
parentc1dd25a915ebe4456e83a568330a3dd00a5be12a
parenta4ea687e0d859683b1d210c8e0b4470ca7d517fc
Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton

[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed